Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <[email protected]>
Sun, 30 May 2010 19:44:07 +0000 (21:44 +0200)
committerWolfgang Denk <[email protected]>
Sun, 30 May 2010 19:44:07 +0000 (21:44 +0200)

Trivial merge